auto merge of #395 : bkoropoff/cargo/import-shadow, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 18 Aug 2014 04:44:14 +0000 (04:44 +0000)
committerbors <bors@rust-lang.org>
Mon, 18 Aug 2014 04:44:14 +0000 (04:44 +0000)
- Update toml-rs to version without import shadowing errors
- Fix some import shadowing errors in the tests


Trivial merge